Restructure package format, add Composite Packages #21
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR re-structures the format of the "package" structure, which also has implications for package-manifest.toml files. What did we change, and why? - Unified internal/external packages: There is information about packages which is shared between internal and external packages, so they've been pulled into the same structure. The "input" for a package is now described by "PackageSource", which can be one of "local" (you're building the package), "prebuilt" (you're downloading the package), "composite" (you're combining packages") or "manual" (you're supplying the package yourself). - The boolean "zone" flag has been updated to an enum, called "PackageOutput". This enum describes the different outputs that one should expect from a package. - The "Target" evaluation information has been moved to this package from the primary Omicron repository. This makes it easier to act on the 'only_for_target' and 'intermediate_only' fields in a useful way.
smklein
commented
Oct 14, 2022
Comment on lines
-16
to
-28
| pub enum ExternalPackageSource { | ||
| /// Downloads the package from the following URL: | ||
| /// | ||
| /// <https://buildomat.eng.oxide.computer/public/file/oxidecomputer/REPO/image/COMMIT/PACKAGE> | ||
| Prebuilt { | ||
| repo: String, | ||
| commit: String, | ||
| sha256: String, | ||
| }, | ||
| /// Expects that a package will be manually built and placed into the output | ||
| /// directory. | ||
| Manual, | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
Everything here has been merged into PackageSource below
smklein
commented
Oct 14, 2022
smklein
commented
Oct 14, 2022
jgallagher
approved these changes
Oct 14, 2022
Contributor
jgallagher
left a comment
jgallagher
left a comment
There was a problem hiding this comment.
LGTM! Left a handful of comments, only one of which is more than a style/nit suggestion (the question about whether composite packages can contain tarball packages).
andrewjstone
approved these changes
Oct 14, 2022
andrewjstone
left a comment
andrewjstone
left a comment
There was a problem hiding this comment.
LGTM. Will be great to have this functionality.
|
|
||
| #[tokio::test] | ||
| #[tokio::test(flavor = "multi_thread")] | ||
| async fn test_composite_package() { |
There was a problem hiding this comment.
This test made usage very clear for me. Thank you!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR re-structures the format of the "package" structure, which also has implications for package-manifest.toml files.
What did we change, and why?
Unified internal/external packages: There is information about packages which is shared between internal and external packages, so they've been pulled into the same structure. The "input" for a package is now described by "PackageSource", which can be one of "local" (you're building the package), "prebuilt" (you're downloading the package), "composite" (you're combining packages") or "manual" (you're supplying the package yourself).
The boolean "zone" flag has been updated to an enum, called "PackageOutput". This enum describes the different outputs that one should expect from a package.
The "Target" evaluation information has been moved to this package from the primary Omicron repository. This makes it easier to act on the 'only_for_target' and 'intermediate_only' fields in a useful way.